Fix the handling of sets in the interface -- expecting a pointer to X to serve

as a list of them was too hopeful -- that's what the set structures are for.

Based upon a patch by Jim Fehlig.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/libxen/include/xen_host.h b/tools/libxen/include/xen_host.h
index d8ed1e776c2e057de58b13e233a8645dfd00690e..8010b24b1ab359edad807c10ca713c708c28983f 100644 (file)
--- a/tools/libxen/include/xen_host.h
+++ b/tools/libxen/include/xen_host.h
@@ -213,21 +213,21 @@ xen_host_get_software_version(xen_session *session, xen_string_string_map **resu
  * Get the resident_VMs field of the given host.
  */
 extern bool
-xen_host_get_resident_vms(xen_session *session, xen_vm *result, xen_host host);
+xen_host_get_resident_vms(xen_session *session, struct xen_vm_set **result, xen_host host);
 
 
 /**
  * Get the PIFs field of the given host.
  */
 extern bool
-xen_host_get_pifs(xen_session *session, xen_pif *result, xen_host host);
+xen_host_get_pifs(xen_session *session, struct xen_pif_set **result, xen_host host);
 
 
 /**
  * Get the host_CPUs field of the given host.
  */
 extern bool
-xen_host_get_host_cpus(xen_session *session, xen_host_cpu *result, xen_host host);
+xen_host_get_host_cpus(xen_session *session, struct xen_host_cpu_set **result, xen_host host);
 
 
 /**
@@ -279,7 +279,7 @@ xen_host_reboot(xen_session *session, xen_host host);
  * Return a list of all the hosts known to the system
  */
 extern bool
-xen_host_get_all(xen_session *session, xen_host *result);
+xen_host_get_all(xen_session *session, struct xen_host_set **result);
 
 
 #endif

diff --git a/tools/libxen/include/xen_network.h b/tools/libxen/include/xen_network.h
index d701033a50502c520d906fb1003b631aefe51273..6b1f65f660ab0961a9030bd13fb720cfa8d9609a 100644 (file)
--- a/tools/libxen/include/xen_network.h
+++ b/tools/libxen/include/xen_network.h
@@ -204,14 +204,14 @@ xen_network_get_name_description(xen_session *session, char **result, xen_networ
  * Get the VIFs field of the given network.
  */
 extern bool
-xen_network_get_vifs(xen_session *session, xen_vif *result, xen_network network);
+xen_network_get_vifs(xen_session *session, struct xen_vif_set **result, xen_network network);
 
 
 /**
  * Get the PIFs field of the given network.
  */
 extern bool
-xen_network_get_pifs(xen_session *session, xen_pif *result, xen_network network);
+xen_network_get_pifs(xen_session *session, struct xen_pif_set **result, xen_network network);
 
 
 /**
@@ -260,7 +260,7 @@ xen_network_set_default_netmask(xen_session *session, xen_network xen_network, c
  * Return a list of all the networks known to the system
  */
 extern bool
-xen_network_get_all(xen_session *session, xen_network *result);
+xen_network_get_all(xen_session *session, struct xen_network_set **result);
 
 
 #endif

diff --git a/tools/libxen/include/xen_sr.h b/tools/libxen/include/xen_sr.h
index 7a0d9fb77318c7fa6c0d293026f96099f560f477..fc6c3f5701a1cb61cc246b1923c29c7fdcb656cf 100644 (file)
--- a/tools/libxen/include/xen_sr.h
+++ b/tools/libxen/include/xen_sr.h
@@ -205,7 +205,7 @@ xen_sr_get_name_description(xen_session *session, char **result, xen_sr sr);
  * Get the VDIs field of the given SR.
  */
 extern bool
-xen_sr_get_vdis(xen_session *session, xen_vdi *result, xen_sr sr);
+xen_sr_get_vdis(xen_session *session, struct xen_vdi_set **result, xen_sr sr);
 
 
 /**
@@ -269,7 +269,7 @@ xen_sr_clone(xen_session *session, xen_sr *result, xen_sr sr, char *loc, char *n
  * Return a list of all the Storage Repositories known to the system
  */
 extern bool
-xen_sr_get_all(xen_session *session, xen_sr *result);
+xen_sr_get_all(xen_session *session, struct xen_sr_set **result);
 
 
 #endif

diff --git a/tools/libxen/include/xen_vdi.h b/tools/libxen/include/xen_vdi.h
index edceb7b8a0d9fce15b6e33d0a8169caffbea4ad3..9fbc9bb756072155e9571fb6b485c0eecaa3a010 100644 (file)
--- a/tools/libxen/include/xen_vdi.h
+++ b/tools/libxen/include/xen_vdi.h
@@ -218,7 +218,7 @@ xen_vdi_get_sr(xen_session *session, xen_sr *result, xen_vdi vdi);
  * Get the VBDs field of the given VDI.
  */
 extern bool
-xen_vdi_get_vbds(xen_session *session, xen_vbd *result, xen_vdi vdi);
+xen_vdi_get_vbds(xen_session *session, struct xen_vbd_set **result, xen_vdi vdi);
 
 
 /**
@@ -260,7 +260,7 @@ xen_vdi_get_parent(xen_session *session, xen_vdi *result, xen_vdi vdi);
  * Get the children field of the given VDI.
  */
 extern bool
-xen_vdi_get_children(xen_session *session, xen_vdi *result, xen_vdi vdi);
+xen_vdi_get_children(xen_session *session, struct xen_vdi_set **result, xen_vdi vdi);
 
 
 /**

diff --git a/tools/libxen/include/xen_vm.h b/tools/libxen/include/xen_vm.h
index fa0d8455157d8032691e746a98668b9826f0751b..af784648efffa8e2b9c5d87579eba9f4541bbd7e 100644 (file)
--- a/tools/libxen/include/xen_vm.h
+++ b/tools/libxen/include/xen_vm.h
@@ -395,21 +395,21 @@ xen_vm_get_actions_after_crash(xen_session *session, enum xen_on_crash_behaviour
  * Get the VIFs field of the given VM.
  */
 extern bool
-xen_vm_get_vifs(xen_session *session, xen_vif *result, xen_vm vm);
+xen_vm_get_vifs(xen_session *session, struct xen_vif_set **result, xen_vm vm);
 
 
 /**
  * Get the VBDs field of the given VM.
  */
 extern bool
-xen_vm_get_vbds(xen_session *session, xen_vbd *result, xen_vm vm);
+xen_vm_get_vbds(xen_session *session, struct xen_vbd_set **result, xen_vm vm);
 
 
 /**
  * Get the VTPMs field of the given VM.
  */
 extern bool
-xen_vm_get_vtpms(xen_session *session, xen_vtpm *result, xen_vm vm);
+xen_vm_get_vtpms(xen_session *session, struct xen_vtpm_set **result, xen_vm vm);
 
 
 /**
@@ -796,7 +796,7 @@ xen_vm_resume(xen_session *session, xen_vm vm, bool start_paused);
  * Return a list of all the VMs known to the system.
  */
 extern bool
-xen_vm_get_all(xen_session *session, xen_vm *result);
+xen_vm_get_all(xen_session *session, struct xen_vm_set **result);
 
 
 #endif

diff --git a/tools/libxen/src/xen_host.c b/tools/libxen/src/xen_host.c
index 7e5600aed81c9618e4719f1c6147df22256bfd3a..455f57d04ce520a7c02ceddb47c2b2fc0cf38d41 100644 (file)
--- a/tools/libxen/src/xen_host.c
+++ b/tools/libxen/src/xen_host.c
@@ -214,7 +214,7 @@ xen_host_get_software_version(xen_session *session, xen_string_string_map **resu
 
 
 bool
-xen_host_get_resident_vms(xen_session *session, xen_vm *result, xen_host host)
+xen_host_get_resident_vms(xen_session *session, struct xen_vm_set **result, xen_host host)
 {
     abstract_value param_values[] =
         {
@@ -231,7 +231,7 @@ xen_host_get_resident_vms(xen_session *session, xen_vm *result, xen_host host)
 
 
 bool
-xen_host_get_pifs(xen_session *session, xen_pif *result, xen_host host)
+xen_host_get_pifs(xen_session *session, struct xen_pif_set **result, xen_host host)
 {
     abstract_value param_values[] =
         {
@@ -248,7 +248,7 @@ xen_host_get_pifs(xen_session *session, xen_pif *result, xen_host host)
 
 
 bool
-xen_host_get_host_cpus(xen_session *session, xen_host_cpu *result, xen_host host)
+xen_host_get_host_cpus(xen_session *session, struct xen_host_cpu_set **result, xen_host host)
 {
     abstract_value param_values[] =
         {
@@ -353,7 +353,7 @@ xen_host_reboot(xen_session *session, xen_host host)
 
 
 bool
-xen_host_get_all(xen_session *session, xen_host *result)
+xen_host_get_all(xen_session *session, struct xen_host_set **result)
 {
 
     abstract_type result_type = abstract_type_string_set;

diff --git a/tools/libxen/src/xen_network.c b/tools/libxen/src/xen_network.c
index 129617199f1b73c6cd3b7fbff66301b8947c1b38..18d650ccbcf2ac1a4dcbbd0f5f791581da22db3e 100644 (file)
--- a/tools/libxen/src/xen_network.c
+++ b/tools/libxen/src/xen_network.c
@@ -195,7 +195,7 @@ xen_network_get_name_description(xen_session *session, char **result, xen_networ
 
 
 bool
-xen_network_get_vifs(xen_session *session, xen_vif *result, xen_network network)
+xen_network_get_vifs(xen_session *session, struct xen_vif_set **result, xen_network network)
 {
     abstract_value param_values[] =
         {
@@ -212,7 +212,7 @@ xen_network_get_vifs(xen_session *session, xen_vif *result, xen_network network)
 
 
 bool
-xen_network_get_pifs(xen_session *session, xen_pif *result, xen_network network)
+xen_network_get_pifs(xen_session *session, struct xen_pif_set **result, xen_network network)
 {
     abstract_value param_values[] =
         {
@@ -327,7 +327,7 @@ xen_network_set_default_netmask(xen_session *session, xen_network xen_network, c
 
 
 bool
-xen_network_get_all(xen_session *session, xen_network *result)
+xen_network_get_all(xen_session *session, struct xen_network_set **result)
 {
 
     abstract_type result_type = abstract_type_string_set;

diff --git a/tools/libxen/src/xen_sr.c b/tools/libxen/src/xen_sr.c
index 0454e786f181a72cdaa673ed8c70e15d9bd1e5c2..d94e1238dd97f04f5252c779f8f977b291b98a1c 100644 (file)
--- a/tools/libxen/src/xen_sr.c
+++ b/tools/libxen/src/xen_sr.c
@@ -199,7 +199,7 @@ xen_sr_get_name_description(xen_session *session, char **result, xen_sr sr)
 
 
 bool
-xen_sr_get_vdis(xen_session *session, xen_vdi *result, xen_sr sr)
+xen_sr_get_vdis(xen_session *session, struct xen_vdi_set **result, xen_sr sr)
 {
     abstract_value param_values[] =
         {
@@ -351,7 +351,7 @@ xen_sr_clone(xen_session *session, xen_sr *result, xen_sr sr, char *loc, char *n
 
 
 bool
-xen_sr_get_all(xen_session *session, xen_sr *result)
+xen_sr_get_all(xen_session *session, struct xen_sr_set **result)
 {
 
     abstract_type result_type = abstract_type_string_set;

diff --git a/tools/libxen/src/xen_vdi.c b/tools/libxen/src/xen_vdi.c
index f3d2749d878f3e38a97b852f33a4ed07b2668c6d..11aaa48085a24eab2a70c6abc486ee713c2ad43c 100644 (file)
--- a/tools/libxen/src/xen_vdi.c
+++ b/tools/libxen/src/xen_vdi.c
@@ -231,7 +231,7 @@ xen_vdi_get_sr(xen_session *session, xen_sr *result, xen_vdi vdi)
 
 
 bool
-xen_vdi_get_vbds(xen_session *session, xen_vbd *result, xen_vdi vdi)
+xen_vdi_get_vbds(xen_session *session, struct xen_vbd_set **result, xen_vdi vdi)
 {
     abstract_value param_values[] =
         {
@@ -330,7 +330,7 @@ xen_vdi_get_parent(xen_session *session, xen_vdi *result, xen_vdi vdi)
 
 
 bool
-xen_vdi_get_children(xen_session *session, xen_vdi *result, xen_vdi vdi)
+xen_vdi_get_children(xen_session *session, struct xen_vdi_set **result, xen_vdi vdi)
 {
     abstract_value param_values[] =
         {

diff --git a/tools/libxen/src/xen_vm.c b/tools/libxen/src/xen_vm.c
index 0f71313a94454ea59d648ecb34392dc76ebc2f11..73ccfb045403926f82844d37129c4356bbb9b537 100644 (file)
--- a/tools/libxen/src/xen_vm.c
+++ b/tools/libxen/src/xen_vm.c
@@ -676,7 +676,7 @@ xen_vm_get_actions_after_crash(xen_session *session, enum xen_on_crash_behaviour
 
 
 bool
-xen_vm_get_vifs(xen_session *session, xen_vif *result, xen_vm vm)
+xen_vm_get_vifs(xen_session *session, struct xen_vif_set **result, xen_vm vm)
 {
     abstract_value param_values[] =
         {
@@ -693,7 +693,7 @@ xen_vm_get_vifs(xen_session *session, xen_vif *result, xen_vm vm)
 
 
 bool
-xen_vm_get_vbds(xen_session *session, xen_vbd *result, xen_vm vm)
+xen_vm_get_vbds(xen_session *session, struct xen_vbd_set **result, xen_vm vm)
 {
     abstract_value param_values[] =
         {
@@ -710,7 +710,7 @@ xen_vm_get_vbds(xen_session *session, xen_vbd *result, xen_vm vm)
 
 
 bool
-xen_vm_get_vtpms(xen_session *session, xen_vtpm *result, xen_vm vm)
+xen_vm_get_vtpms(xen_session *session, struct xen_vtpm_set **result, xen_vm vm)
 {
     abstract_value param_values[] =
         {
@@ -1559,7 +1559,7 @@ xen_vm_resume(xen_session *session, xen_vm vm, bool start_paused)
 
 
 bool
-xen_vm_get_all(xen_session *session, xen_vm *result)
+xen_vm_get_all(xen_session *session, struct xen_vm_set **result)
 {
 
     abstract_type result_type = abstract_type_string_set;